bitkeeper revision 1.1769 (42c2cac1Ua7yeT9FnpvjJNvdSrd3BA)

Remove ticks_per_usec global variable. cpu_khz suffices.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/delay.c b/xen/arch/x86/delay.c
index cde5e18b5ff2d67a855d63b3d070d405c18f72a1..f796870a0dccfca1f4fbd9df2e7e732e06e82c7f 100644 (file)
--- a/xen/arch/x86/delay.c
+++ b/xen/arch/x86/delay.c
@@ -12,12 +12,13 @@
 
 #include <xen/config.h>
 #include <xen/delay.h>
+#include <xen/time.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
 
 void __udelay(unsigned long usecs)
 {
-    unsigned long ticks = usecs * ticks_per_usec;
+    unsigned long ticks = usecs * (cpu_khz / 1000);
     unsigned long s, e;
 
     rdtscl(s);

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 2efd0187b0642ad32fda69e8b429a20baff20904..acc5979c2bd2262b62c4a3e723564c8352df8337 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -33,8 +33,7 @@
 #include <asm/mc146818rtc.h>
 
 /* GLOBAL */
-unsigned long cpu_khz;  /* Detected as we calibrate the TSC */
-unsigned long ticks_per_usec; /* TSC ticks per microsecond. */
+unsigned long cpu_khz;  /* CPU clock frequency in kHz. */
 spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
 int timer_ack = 0;
 unsigned long volatile jiffies;
@@ -375,7 +374,6 @@ void __init time_init(void)
     if ( !ticks_per_frac )
         panic("Error calibrating TSC\n");
 
-    ticks_per_usec = ticks_per_frac / (1000000/CALIBRATE_FRAC);
     cpu_khz = ticks_per_frac / (1000/CALIBRATE_FRAC);
 
     cpu_freq = (u64)ticks_per_frac * (u64)CALIBRATE_FRAC;

diff --git a/xen/include/asm-x86/delay.h b/xen/include/asm-x86/delay.h
index b294c419180afb0c1a12daece948874467127e95..9be2f465901a52064fa3906bd7c08042fcf88b21 100644 (file)
--- a/xen/include/asm-x86/delay.h
+++ b/xen/include/asm-x86/delay.h
@@ -7,7 +7,6 @@
  * Delay routines calling functions in arch/i386/lib/delay.c
  */
 
-extern unsigned long ticks_per_usec; 
 extern void __udelay(unsigned long usecs);
 #define udelay(n) __udelay(n)